Add color and font chooser to the widget gallery

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 54f3c7a33d52904c638a684bce8a5d1cc9ffa3a0..5099c337a355f3c8f726a56d53860f8671065006 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -287,6 +287,7 @@ HTML_IMAGES = \
        $(srcdir)/images/check-button.png                               \
        $(srcdir)/images/color-button.png                               \
        $(srcdir)/images/colorsel.png                                   \
+       $(srcdir)/images/colorchooser.png                               \
        $(srcdir)/images/combo-box.png                                  \
        $(srcdir)/images/combo-box-entry.png                            \
        $(srcdir)/images/entry.png                                      \
@@ -296,6 +297,7 @@ HTML_IMAGES = \
        $(srcdir)/images/filechooser.png                                \
        $(srcdir)/images/font-button.png                                \
        $(srcdir)/images/fontsel.png                                    \
+       $(srcdir)/images/fontchooser.png                                \
        $(srcdir)/images/frame.png                                      \
        $(srcdir)/images/icon-view.png                                  \
        $(srcdir)/images/image.png                                      \

diff --git a/docs/reference/gtk/images/colorchooser.png b/docs/reference/gtk/images/colorchooser.png
new file mode 100644 (file)
index 0000000..fcdabf0
Binary files /dev/null and b/docs/reference/gtk/images/colorchooser.png differ

diff --git a/docs/reference/gtk/images/fontchooser.png b/docs/reference/gtk/images/fontchooser.png
new file mode 100644 (file)
index 0000000..38e3e8f
Binary files /dev/null and b/docs/reference/gtk/images/fontchooser.png differ

diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index 37cc0ec6cfcd87ac269bf2f1bc236952a50b2fdc..7fb63932d47fd9f1781c5ed4c668c59a2b74426f 100644 (file)
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -135,4 +135,10 @@
   <link linkend="GtkSwitch">
     <inlinegraphic fileref="switch.png" format="PNG"></inlinegraphic>
   </link>
+  <link linkend="GtkColorChooserDialog">
+    <inlinegraphic fileref="colorchooser.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkFontChooserDialog">
+    <inlinegraphic fileref="fontchooser.png" format="PNG"></inlinegraphic>
+  </link>
 </para>

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 949a35a3d91bfae825ccadb123f43556a247ae44..5b326090f47cbc6609ccce18f5ff93e0888774ed 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -1154,6 +1154,33 @@ create_appchooserdialog (void)
   return info;
 }
 
+static WidgetInfo *
+create_fontchooserdialog (void)
+{
+  WidgetInfo *info;
+  GtkWidget *widget;
+
+  widget = gtk_font_chooser_dialog_new ("Font Chooser Dialog", NULL);
+  gtk_window_set_default_size (GTK_WINDOW (widget), 200, 300);
+  info = new_widget_info ("fontchooser", widget, ASIS);
+  info->include_decorations = TRUE;
+
+  return info;
+}
+
+static WidgetInfo *
+create_colorchooserdialog (void)
+{
+  WidgetInfo *info;
+  GtkWidget *widget;
+
+  widget = gtk_color_chooser_dialog_new ("Color Chooser Dialog", NULL);
+  info = new_widget_info ("colorchooser", widget, ASIS);
+  info->include_decorations = TRUE;
+
+  return info;
+}
+
 GList *
 get_all_widgets (void)
 {
@@ -1204,6 +1231,8 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_appchooserbutton ());
   retval = g_list_prepend (retval, create_appchooserdialog ());
   retval = g_list_prepend (retval, create_lockbutton ());
+  retval = g_list_prepend (retval, create_fontchooserdialog ());
+  retval = g_list_prepend (retval, create_colorchooserdialog ());
 
   return retval;
 }